Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Sep 2011 14:16:04 +0000 (07:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Sep 2011 14:16:04 +0000 (07:16 -0700)
commit0a08f69e8b350a879f3a796c477878e4e7101a29
tree69c8b3d594eb2c39e0c866e5cf73007502b1c4b6
parent922a5d71e37410182c0f6e4a4e09d381bc65d92b
parentfa4c2494e360adb397c14ffbf826673f1afaa2d5
Merge from trunk.